Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 14 Apr 2011 20:16:48 +0000 (13:16 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 14 Apr 2011 20:16:48 +0000 (13:16 -0700)
commitd4476150cb9edcbb39fa6764c71dcd66fe721eba
tree511e18e436a3d074752b7760a7fec09ad2236b38
parent4500b5c9e447fdfdb61500926c757700a7b02ad4
parent225964d7ab6db0788d9cd3466155011ac0d9ccec
Merge from mainline.
src/ChangeLog
src/alloc.c
src/charset.c
src/fileio.c
src/keyboard.c
src/lisp.h
src/sound.c
src/sysdep.c
src/xdisp.c
src/xfns.c
src/xsettings.c